Update to new iter names to fix building with current rustc

diff --git a/src/bin/cargo.rs b/src/bin/cargo.rs
index 017abb33a2543e47a9d68f0a23ce6100d381cd35..a0b024f7beed4ad799bb8cc4aca1f1f167e15b7b 100644 (file)
--- a/src/bin/cargo.rs
+++ b/src/bin/cargo.rs
@@ -82,7 +82,7 @@ fn execute(flags: Flags, shell: &mut MultiShell) -> CliResult<Option<()>> {
 
     if flags.flag_list {
         println!("Installed Commands:");
-        for command in list_commands().move_iter() {
+        for command in list_commands().into_iter() {
             println!("    {}", command);
         };
         return Ok(None)

diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs
index 63eadc2dc4fb4fdc81994f9df7e2a627d5192f4e..369ad7bf619a1e1898037a41bce522846a044667 100644 (file)
--- a/src/cargo/core/registry.rs
+++ b/src/cargo/core/registry.rs
@@ -107,7 +107,7 @@ impl<'a> PackageRegistry<'a> {
         for s in self.overrides.iter() {
             let src = self.sources.get_mut(s).unwrap();
             let dep = Dependency::new_override(dep.get_name(), s);
-            ret.extend(try!(src.query(&dep)).move_iter().filter(|s| {
+            ret.extend(try!(src.query(&dep)).into_iter().filter(|s| {
                 seen.insert(s.get_name().to_string())
             }));
         }
@@ -118,7 +118,7 @@ impl<'a> PackageRegistry<'a> {
 fn dedup(ids: Vec<SourceId>) -> Vec<SourceId> {
     let mut seen = vec!();
 
-    for id in ids.move_iter() {
+    for id in ids.into_iter() {
         if seen.contains(&id) { continue; }
         seen.push(id);
     }

diff --git a/src/cargo/core/source.rs b/src/cargo/core/source.rs
index 86192b464b4f6bdefc4546263e6192a3ece9cd1c..145776558586bdc45063aed817eab317afaf1110 100644 (file)
--- a/src/cargo/core/source.rs
+++ b/src/cargo/core/source.rs
@@ -330,7 +330,7 @@ impl<'a> SourceMap<'a> {
     }
 
     pub fn sources_mut(&'a mut self) -> SourcesMut<'a> {
-        self.map.mut_iter().map(|(_, v)| { let s: &mut Source+'a = &mut **v; s })
+        self.map.iter_mut().map(|(_, v)| { let s: &mut Source+'a = &mut **v; s })
     }
 }
 
@@ -348,7 +348,7 @@ impl<'a> Registry for SourceSet<'a> {
     fn query(&mut self, name: &Dependency) -> CargoResult<Vec<Summary>> {
         let mut ret = Vec::new();
 
-        for source in self.sources.mut_iter() {
+        for source in self.sources.iter_mut() {
             ret.push_all_move(try!(source.query(name)));
         }
 
@@ -358,7 +358,7 @@ impl<'a> Registry for SourceSet<'a> {
 
 impl<'a> Source for SourceSet<'a> {
     fn update(&mut self) -> CargoResult<()> {
-        for source in self.sources.mut_iter() {
+        for source in self.sources.iter_mut() {
             try!(source.update());
         }
 
@@ -366,7 +366,7 @@ impl<'a> Source for SourceSet<'a> {
     }
 
     fn download(&mut self, packages: &[PackageId]) -> CargoResult<()> {
-        for source in self.sources.mut_iter() {
+        for source in self.sources.iter_mut() {
             try!(source.download(packages));
         }
 

diff --git a/src/cargo/ops/cargo_fetch.rs b/src/cargo/ops/cargo_fetch.rs
index 3cdb92fbe1be96fd13093c251a74492e7323c036..4120c43844b86f29c244a202c6b4b57e25df8d73 100644 (file)
--- a/src/cargo/ops/cargo_fetch.rs
+++ b/src/cargo/ops/cargo_fetch.rs
@@ -56,7 +56,7 @@ pub fn resolve_and_fetch(registry: &mut PackageRegistry, package: &Package)
 fn add_lockfile_sources(registry: &mut PackageRegistry,
                         root: &Package,
                         resolve: &Resolve) -> CargoResult<()> {
-    let deps = resolve.deps(root.get_package_id()).move_iter().flat_map(|deps| {
+    let deps = resolve.deps(root.get_package_id()).into_iter().flat_map(|deps| {
         deps.map(|d| (d.get_name(), d))
     }).collect::<HashMap<_, _>>();
 
@@ -91,7 +91,7 @@ fn add_lockfile_sources(registry: &mut PackageRegistry,
     fn fill_with_deps<'a>(resolve: &'a Resolve, dep: &'a PackageId,
                           set: &mut HashSet<&'a PackageId>) {
         if !set.insert(dep) { return }
-        for mut deps in resolve.deps(dep).move_iter() {
+        for mut deps in resolve.deps(dep).into_iter() {
             for dep in deps {
                 fill_with_deps(resolve, dep, set);
             }

diff --git a/src/cargo/ops/cargo_read_manifest.rs b/src/cargo/ops/cargo_read_manifest.rs
index a52f98df0cfe5a8de80cc8b05d5c46f7eebd3ce7..7681a65406a8f4c721fc0c16c7453f079bf68013 100644 (file)
--- a/src/cargo/ops/cargo_read_manifest.rs
+++ b/src/cargo/ops/cargo_read_manifest.rs
@@ -105,7 +105,7 @@ fn read_nested_packages(path: &Path, source_id: &SourceId,
 }
 
 fn push_all(set: &mut Vec<Package>, packages: Vec<Package>) {
-    for package in packages.move_iter() {
+    for package in packages.into_iter() {
         if set.contains(&package) { continue; }
 
         set.push(package)

diff --git a/src/cargo/ops/cargo_rustc/job_queue.rs b/src/cargo/ops/cargo_rustc/job_queue.rs
index 7c32426c75ee84ff3cb1c3bb98c7dc3ab9846fcc..6372acaf80c08d47b5ee460799130d0e3bf11cc0 100644 (file)
--- a/src/cargo/ops/cargo_rustc/job_queue.rs
+++ b/src/cargo/ops/cargo_rustc/job_queue.rs
@@ -164,7 +164,7 @@ impl<'a, 'b> JobQueue<'a, 'b> {
             fresh: fresh,
         });
 
-        for (job, job_freshness) in jobs.move_iter() {
+        for (job, job_freshness) in jobs.into_iter() {
             let fresh = job_freshness.combine(fresh);
             let my_tx = self.tx.clone();
             let id = id.clone();
@@ -198,7 +198,7 @@ impl<'a> Dependency<&'a Resolve> for (&'a PackageId, TargetStage) {
         let (id, stage) = *self;
         match stage {
             StageStart => {
-                resolve.deps(id).move_iter().flat_map(|a| a).filter(|dep| {
+                resolve.deps(id).into_iter().flat_map(|a| a).filter(|dep| {
                     *dep != id
                 }).map(|dep| {
                     (dep, StageEnd)

diff --git a/src/cargo/ops/cargo_rustc/mod.rs b/src/cargo/ops/cargo_rustc/mod.rs
index 073110fdef35de08238d4790914c0ad1869dfd69..a94d93ae1a49f4ff8a4bcf5bd0d40fd2f7836247 100644 (file)
--- a/src/cargo/ops/cargo_rustc/mod.rs
+++ b/src/cargo/ops/cargo_rustc/mod.rs
@@ -132,7 +132,7 @@ fn compile<'a, 'b>(targets: &[&'a Target], pkg: &'a Package,
         _ => format!("custom build commands"),
     };
     let dirty = proc() {
-        for cmd in build_cmds.move_iter() { try!(cmd()) }
+        for cmd in build_cmds.into_iter() { try!(cmd()) }
         dirty()
     };
     jobs.enqueue(pkg, StageCustomBuild, vec![(Job::new(dirty, fresh, desc),
@@ -154,7 +154,7 @@ fn compile<'a, 'b>(targets: &[&'a Target], pkg: &'a Package,
         };
 
         let dst = if target.is_lib() {&mut libs} else {&mut bins};
-        for (work, kind, desc) in work.move_iter() {
+        for (work, kind, desc) in work.into_iter() {
             let (freshness, dirty, fresh) =
                 try!(fingerprint::prepare_target(cx, pkg, target, kind));
 
@@ -239,7 +239,7 @@ fn rustc(package: &Package, target: &Target,
     let primary = cx.primary;
     let rustcs = try!(prepare_rustc(package, target, crate_types, cx, req));
 
-    Ok(rustcs.move_iter().map(|(rustc, kind)| {
+    Ok(rustcs.into_iter().map(|(rustc, kind)| {
         let name = package.get_name().to_string();
         let desc = rustc.to_string();
 

diff --git a/src/cargo/sources/git/source.rs b/src/cargo/sources/git/source.rs
index 2f6903f951d35eab5823dcd8b5083d4167f01367..b68a6e9ef837c0540c889b15b6c553fc76a30773 100644 (file)
--- a/src/cargo/sources/git/source.rs
+++ b/src/cargo/sources/git/source.rs
@@ -109,7 +109,7 @@ pub fn canonicalize_url(url: &Url) -> Url {
                 rel.port = Some(443);
                 rel.default_port = Some(443);
                 let path = mem::replace(&mut rel.path, Vec::new());
-                rel.path = path.move_iter().map(|s| {
+                rel.path = path.into_iter().map(|s| {
                     s.as_slice().chars().map(|c| c.to_lowercase()).collect()
                 }).collect();
             }

diff --git a/src/cargo/sources/git/utils.rs b/src/cargo/sources/git/utils.rs
index 532508865f172f6882fb21e1ebe955e821e67afe..03919f45d7d11a10d92cbf36b276ca996b2c7106 100644 (file)
--- a/src/cargo/sources/git/utils.rs
+++ b/src/cargo/sources/git/utils.rs
@@ -307,7 +307,7 @@ impl<'a> GitCheckout<'a> {
         fn update_submodules(repo: &git2::Repository) -> CargoResult<()> {
             info!("update submodules for: {}", repo.path().display());
 
-            for mut child in try!(repo.submodules()).move_iter() {
+            for mut child in try!(repo.submodules()).into_iter() {
                 try!(child.init(false));
                 let url = try!(child.url().require(|| {
                     internal("non-utf8 url for submodule")

diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
index 57f7a57538d2aa3ffe322a2ce3dc568cfac6f08c..7977075693727f34bf22f6af445f9aae79c84a85 100644 (file)
--- a/src/cargo/sources/path.rs
+++ b/src/cargo/sources/path.rs
@@ -90,7 +90,7 @@ impl PathSource {
             Pattern::new(p.as_slice())
         }).collect::<Vec<Pattern>>();
 
-        Ok(candidates.move_iter().filter(|candidate| {
+        Ok(candidates.into_iter().filter(|candidate| {
             let relative_path = candidate.path_relative_from(&root).unwrap();
             !pats.iter().any(|p| p.matches_path(&relative_path)) &&
                 candidate.is_file()

diff --git a/src/cargo/sources/registry.rs b/src/cargo/sources/registry.rs
index d261b1d6890114f4dbe6d409d6e3894d855cabc8..3a91e78d1c8eed87edbf60fc4c07886a632773df 100644 (file)
--- a/src/cargo/sources/registry.rs
+++ b/src/cargo/sources/registry.rs
@@ -276,7 +276,7 @@ impl<'a, 'b> Source for RegistrySource<'a, 'b> {
     fn get(&self, packages: &[PackageId]) -> CargoResult<Vec<Package>> {
         let mut ret = Vec::new();
         for src in self.sources.iter() {
-            ret.extend(try!(src.get(packages)).move_iter());
+            ret.extend(try!(src.get(packages)).into_iter());
         }
         return Ok(ret);
     }

diff --git a/src/cargo/util/config.rs b/src/cargo/util/config.rs
index c0324b89190eabd113025c29d6c4df3dde7469ec..b780d94353b1303b2cdff0d0d323c6ee41cbfbdf 100644 (file)
--- a/src/cargo/util/config.rs
+++ b/src/cargo/util/config.rs
@@ -160,11 +160,11 @@ impl ConfigValue {
             (&Boolean(..), Boolean(..)) => {}
             (&List(ref mut old), List(ref mut new)) => {
                 let new = mem::replace(new, Vec::new());
-                old.extend(new.move_iter());
+                old.extend(new.into_iter());
             }
             (&Table(ref mut old), Table(ref mut new)) => {
                 let new = mem::replace(new, HashMap::new());
-                for (key, value) in new.move_iter() {
+                for (key, value) in new.into_iter() {
                     let mut err = Ok(());
                     old.find_with_or_insert_with(key, value,
                                                  |_, old, new| err = old.merge(new),
@@ -226,9 +226,9 @@ impl ConfigValue {
         match self {
             Boolean(s, _) => toml::Boolean(s),
             String(s, _) => toml::String(s),
-            List(l) => toml::Array(l.move_iter().map(|(s, _)| toml::String(s))
+            List(l) => toml::Array(l.into_iter().map(|(s, _)| toml::String(s))
                                     .collect()),
-            Table(l) => toml::Table(l.move_iter()
+            Table(l) => toml::Table(l.into_iter()
                                      .map(|(k, v)| (k, v.into_toml()))
                                      .collect()),
         }

diff --git a/src/cargo/util/dependency_queue.rs b/src/cargo/util/dependency_queue.rs
index 28070e2999bf28c224e5745531ee69751632d5c5..8bad655336a638ae979cf51c70aa55a2d453cf01 100644 (file)
--- a/src/cargo/util/dependency_queue.rs
+++ b/src/cargo/util/dependency_queue.rs
@@ -77,7 +77,7 @@ impl<C, K: Dependency<C>, V> DependencyQueue<K, V> {
         }
 
         let mut my_dependencies = HashSet::new();
-        for dep in key.dependencies(cx).move_iter() {
+        for dep in key.dependencies(cx).into_iter() {
             assert!(my_dependencies.insert(dep.clone()));
             let rev = self.reverse_dep_map.find_or_insert(dep, HashSet::new());
             assert!(rev.insert(key.clone()));

diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index 78ca4769f80cef00538b617cfa44e4d7b8177e73..ec2e675ff27d57bdf08bfd2f1461f734501a3462 100644 (file)
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -49,7 +49,7 @@ fn try_add_file(files: &mut Vec<Path>, root: &Path, dir: &str) {
 fn try_add_files(files: &mut Vec<Path>, root: &Path, dir: &str) {
     match fs::readdir(&root.join(dir)) {
         Ok(new) => {
-            files.extend(new.move_iter().filter(|f| f.extension_str() == Some("rs")))
+            files.extend(new.into_iter().filter(|f| f.extension_str() == Some("rs")))
         }
         Err(_) => {/* just don't add anything if the directory doesn't exist, etc. */}
     }
@@ -651,7 +651,7 @@ fn normalize(libs: &[TomlLibTarget],
         }
 
         if target.plugin == Some(true) {
-            ret = ret.move_iter().map(|p| p.plugin(true)).collect();
+            ret = ret.into_iter().map(|p| p.plugin(true)).collect();
         }
 
         ret